[pull] main from containerd:main#56
Open
pull[bot] wants to merge 6120 commits into
Open
Conversation
Bumps the k8s group with 5 updates in the / directory: | Package | From | To | | --- | --- | --- | | [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.36.0` | `0.36.1` | | [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.36.0` | `0.36.1` | | [k8s.io/cri-api](https://github.com/kubernetes/cri-api) | `0.36.0` | `0.36.1` | | [k8s.io/cri-client](https://github.com/kubernetes/cri-client) | `0.36.0` | `0.36.1` | | [k8s.io/cri-streaming](https://github.com/kubernetes/cri-streaming) | `0.36.0` | `0.36.1` | Updates `k8s.io/apimachinery` from 0.36.0 to 0.36.1 - [Commits](kubernetes/apimachinery@v0.36.0...v0.36.1) Updates `k8s.io/client-go` from 0.36.0 to 0.36.1 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.36.0...v0.36.1) Updates `k8s.io/cri-api` from 0.36.0 to 0.36.1 - [Commits](kubernetes/cri-api@v0.36.0...v0.36.1) Updates `k8s.io/cri-client` from 0.36.0 to 0.36.1 - [Commits](kubernetes/cri-client@v0.36.0...v0.36.1) Updates `k8s.io/cri-streaming` from 0.36.0 to 0.36.1 - [Commits](kubernetes/cri-streaming@v0.36.0...v0.36.1) Updates `k8s.io/streaming` from 0.36.0 to 0.36.1 - [Commits](kubernetes/streaming@v0.36.0...v0.36.1) --- updated-dependencies: - dependency-name: k8s.io/apimachinery dependency-version: 0.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s - dependency-name: k8s.io/client-go dependency-version: 0.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s - dependency-name: k8s.io/cri-api dependency-version: 0.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s - dependency-name: k8s.io/cri-client dependency-version: 0.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s - dependency-name: k8s.io/cri-streaming dependency-version: 0.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s - dependency-name: k8s.io/streaming dependency-version: 0.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s ... Signed-off-by: dependabot[bot] <support@github.com>
`strconv.NumError` implements `Unwrap` (see https://go.dev/cl/194563), so there's no need to manually assert the type and unwrap. Updates 9439355 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
pkg/oci: WithUser: remove redundant isErrRange utility
…ocker/setup-buildx-action-4.1.0 build(deps): bump docker/setup-buildx-action from 4.0.0 to 4.1.0
…olangci/golangci-lint-action-9.2.1 build(deps): bump golangci/golangci-lint-action from 9.2.0 to 9.2.1
Bumps [docker/login-action](https://github.com/docker/login-action) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@4907a6d...650006c) --- updated-dependencies: - dependency-name: docker/login-action dependency-version: 4.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…ithub/codeql-action-4.36.0 build(deps): bump github/codeql-action from 4.35.2 to 4.36.0
…g-x-9bb1109951 build(deps): bump golang.org/x/sys from 0.44.0 to 0.45.0 in the golang-x group
…ctions/stale-10.3.0 build(deps): bump actions/stale from 10.2.0 to 10.3.0
…565455e06 build(deps): bump the k8s group across 1 directory with 6 updates
…ce-on-windows core/runtime/v2: fix race on Windows deferredPipeConnection.c in Read
Signed-off-by: lujinda <q8886888@qq.com> Signed-off-by: jinda.ljd <jinda.ljd@alibaba-inc.com>
…ocker/login-action-4.2.0 build(deps): bump docker/login-action from 4.1.0 to 4.2.0
Expected to fix issue 13486 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Vagrantfile: update DNF cache
Best practice for interpolation of input variables for bash scripts in Github workflows is to preresolve them into strings during an env step to avoid script injection; see docs at https://docs.github.com/en/actions/reference/security/secure-use#use-an-intermediate-environment-variable Signed-off-by: lauralorenz <lauralorenz@google.com>
The RunPodSandbox unconditionally pre-pulls the pause container image via ensurePauseImageExists() before starting any sandbox. However, only the "podsandbox" controller actually uses the pause image to create a pause container holding namespaces. Shim-based sandbox controllers (e.g. Kata Containers) manage the sandbox lifecycle entirely at the shim level and never reference the pause image. Add a DisablePauseImagePull flag to the Runtime config that gates ensurePauseImageExists(). When a sandboxer is not "podsandbox", the flag skips the unnecessary pre-pull, avoiding wasted network/storage overhead and reducing sandbox startup latency. The long-term direction is to offload image pulling entirely to the controller implementation (shim level); this flag is an incremental step toward that goal without introducing a breaking behavior change. Also add unit tests to verify that ensurePauseImageExists is only invoked for the "podsandbox" sandboxer and correctly skipped otherwise. Signed-off-by: Alex Lyn <alex.lyn@antgroup.com>
Signed-off-by: Jordan Liggitt <liggitt@google.com>
cri: skip pause image pull for shim sandboxer
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.81.0 to 1.81.1. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.81.0...v1.81.1) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-version: 1.81.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…e.golang.org/grpc-1.81.1 build(deps): bump google.golang.org/grpc from 1.81.0 to 1.81.1
Update typeurl/v2 to v2.3.0 to drop gogo dependency
Bumps the otel group with 5 updates in the / directory: | Package | From | To | | --- | --- | --- | | [go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc](https://github.com/open-telemetry/opentelemetry-go-contrib) | `0.68.0` | `0.69.0` | | [go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp](https://github.com/open-telemetry/opentelemetry-go-contrib) | `0.68.0` | `0.69.0` | | [go.opentelemetry.io/otel/exporters/otlp/otlptrace](https://github.com/open-telemetry/opentelemetry-go) | `1.43.0` | `1.44.0` | | [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc](https://github.com/open-telemetry/opentelemetry-go) | `1.43.0` | `1.44.0` | | [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp](https://github.com/open-telemetry/opentelemetry-go) | `1.43.0` | `1.44.0` | Updates `go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc` from 0.68.0 to 0.69.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go-contrib@zpages/v0.68.0...zpages/v0.69.0) Updates `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` from 0.68.0 to 0.69.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go-contrib@zpages/v0.68.0...zpages/v0.69.0) Updates `go.opentelemetry.io/otel` from 1.43.0 to 1.44.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.43.0...v1.44.0) Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace` from 1.43.0 to 1.44.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.43.0...v1.44.0) Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc` from 1.43.0 to 1.44.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.43.0...v1.44.0) Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp` from 1.43.0 to 1.44.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.43.0...v1.44.0) Updates `go.opentelemetry.io/otel/sdk` from 1.43.0 to 1.44.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.43.0...v1.44.0) Updates `go.opentelemetry.io/otel/trace` from 1.43.0 to 1.44.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.43.0...v1.44.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc dependency-version: 0.69.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp dependency-version: 0.69.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/otel dependency-version: 1.44.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace dependency-version: 1.44.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc dependency-version: 1.44.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp dependency-version: 1.44.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/otel/sdk dependency-version: 1.44.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/otel/trace dependency-version: 1.44.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel ... Signed-off-by: dependabot[bot] <support@github.com>
The task service guards its containers map with s.mu, and getContainer()
takes it on behalf of effectively every task RPC (State, Connect, Stats,
Wait, Pause, Kill, ...). Create() held s.mu for its whole duration,
including runc.NewContainer(), which runs the actual `runc create`.
`runc create` can be slow on a loaded host. While it runs, any concurrent
task RPC blocks on s.mu. The tasks service applies a 2s timeout to State
(io.containerd.timeout.task.state), so a concurrent State waits on s.mu,
exceeds the deadline, and the ttrpc call is abandoned -- the late shim
reply then shows up as:
ttrpc: received message on inactive stream stream=3
Since deadline errors are now surfaced to clients, this is treated as a
fatal failure and the just-created container is torn down right after
start (observed on Lima/vz: nginx -> Exited (1)).
Move runc.NewContainer() out of the s.mu critical section, mirroring the
runtime v1 shim lock optimization. s.mu is taken only once the container
exists, to guard the map and the remaining (fast) setup, so a slow create
no longer blocks concurrent State and other lookups.
preStart/handleStarted/cleanup only use s.lifecycleMu, so early-exit
handling is unchanged.
See lima-vm/lima#5030.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
…304265291e build(deps): bump the otel group across 1 directory with 8 updates
Between starting the sandbox and adding it to the sandbox store, there are opportunities for failures including in any NRI RunPodSandbox prehooks. This defer is added to that period so if they fail, this function will try to clean it up itself. If the sandbox is already added to the persistent store, it will not attempt to stop the sandbox as it can now be recognized by other components from the CRI store. ShutdownSandbox is used instead of StopSandbox as it both stops it and cleans up all its directories. Signed-off-by: lauralorenz <lauralorenz@google.com>
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Resurrect 2.1 branch for a short period
Update the Fuzzing workflow to upload crash artifacts found during the go_test_fuzz job. Currently, when `go test -fuzz` fails, the crash reproducers are generated but not preserved, making it difficult to diagnose and fix the issues discovered in CI. This change adds an upload-artifact step that captures all files in testdata/fuzz directories across the repository upon failure. Assisted-by: gemini-cli Signed-off-by: Samuel Karp <samuelkarp@google.com> Signed-off-by: lauralorenz <lauralorenz@google.com>
…nectShim integration: deflake TestFailFastWhenConnectShim
Bumps [github.com/pelletier/go-toml/v2](https://github.com/pelletier/go-toml) from 2.4.2 to 2.4.3. - [Release notes](https://github.com/pelletier/go-toml/releases) - [Commits](pelletier/go-toml@v2.4.2...v2.4.3) --- updated-dependencies: - dependency-name: github.com/pelletier/go-toml/v2 dependency-version: 2.4.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github/codeql-action/upload-sarif](https://github.com/github/codeql-action) from 4.36.2 to 4.37.0. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@8aad20d...99df26d) --- updated-dependencies: - dependency-name: github/codeql-action/upload-sarif dependency-version: 4.37.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/stale](https://github.com/actions/stale) from 10.3.0 to 10.4.0. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](actions/stale@eb5cf3a...1e223db) --- updated-dependencies: - dependency-name: actions/stale dependency-version: 10.4.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…ex-check overlay: don't override a configured index mount option
README: remove Go Report Card badge
…ctions/stale-10.4.0 build(deps): bump actions/stale from 10.3.0 to 10.4.0
…b.com/pelletier/go-toml/v2-2.4.3 build(deps): bump github.com/pelletier/go-toml/v2 from 2.4.2 to 2.4.3
…ocker/login-action-4.4.0 build(deps): bump docker/login-action from 4.2.0 to 4.4.0
…ocker/setup-buildx-action-4.2.0 build(deps): bump docker/setup-buildx-action from 4.1.0 to 4.2.0
…ithub/codeql-action/upload-sarif-4.37.0 build(deps): bump github/codeql-action/upload-sarif from 4.36.2 to 4.37.0
fsmount: Fix selinux mount parameter parsing
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>
Right now the statement is treating any error from the shim as leaking (len(pInfo == 0 is true for any error). It seems the intent was to only treat shims this way if the error was not found, or if there's legitimately no pids associated with the shim. Let's fix that up to avoid orphaning shims that just had a small error in reading pids. Link: #13784 Signed-off-by: Andrew Halaney <ahalaney@netflix.com>
…ctions/attest-build-provenance-4.1.1 build(deps): bump actions/attest-build-provenance from 4.1.0 to 4.1.1
…g-x-017d72eac4 build(deps): bump golang.org/x/mod from 0.37.0 to 0.38.0 in the golang-x group
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.51.0 to 0.55.0. - [Commits](golang/net@v0.51.0...v0.55.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-version: 0.55.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
This commit introduces a comprehensive threat model, and security triage guide, and operator guidelines based on the code, documentation and a review of the published GitHub Security Advisories (GHSAs) Assisted-by: gemini-cli Assisted-by: Antigravity Assisted-by: Claude Code (Opus 4.8) Co-authored-by: Vinayak Goyal <vinayakankugoyal@gmail.com> Signed-off-by: Samuel Karp <samuelkarp@google.com>
The debug server plugin returns ErrSkipPlugin when its address is empty and the default configuration emitted by 'containerd config default' sets the address to an empty string. Assisted-by: Claude Code (Opus 4.8) Signed-off-by: Samuel Karp <samuelkarp@google.com>
Add a layer_content_cache option to the erofs snapshotter: a directory of pre-converted, diffID-keyed erofs layer blobs (in production a read-only mountpoint-s3/FUSE mount) that the snapshotter sources layers from on pull instead of downloading and converting them per node. On an image-layer extraction Prepare, if the layer's blob is present in the cache the snapshotter stages it as a symlink, commits it as the target chainID in the same transaction, and returns ErrAlreadyExists. This uses the existing remote-snapshot protocol, so containerd skips both the layer download and the tar->erofs conversion; no core changes are needed. Any miss (cache disabled, no snapshot.ref/diff-id labels, blob absent, unreadable cache) falls through to the normal path, so pulls keep working. Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
Add `ctr images build-erofs-cache <image> <cache_dir>`, which reads an already-pulled image's layers from the content store, converts each into a directly-mountable erofs blob, and writes them under <cache_dir>/<algorithm>/<hex>.erofs keyed by the layer's diffID. This populates the directory the erofs snapshotter's layer_content_cache reads on pull; because the key is the source diffID, layers shared across images converge on one blob. No converted image is produced. Extract the per-layer uncompress + mkfs.erofs step out of LayerConvertFunc into an exported ConvertLayerToErofs so the image converter and the cache builder share a single conversion path. Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
Add a --dmverity flag to `ctr images build-erofs-cache`. When set, each cached erofs blob is dm-verity formatted (the hash tree is appended in place) and a .dmverity sidecar is written alongside it. This is required when the erofs snapshotter runs with dmverity_mode=on, which rejects cache hits that lack a sidecar; without it such layers would have to be formatted out-of-band. Extract the differ's dm-verity formatting into a shared dmverity.FormatLayer so the differ and the cache builder share one implementation; the differ's formatDmverityLayer now delegates to it. Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
docs: add threat model and triage guide
erofs: support warm image cache
docs: correct default for [debug] address
…olang.org/x/net-0.55.0 build(deps): bump golang.org/x/net from 0.51.0 to 0.55.0 in /api
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
build: bump github.com/containerd/nri
Fix flaky CI on windows
shim_load: Consider shim leaked only if we can't find pids
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )